Skip to content

Use project.version for release assembly folders - #1621

Merged
jodygarnett merged 2 commits into
GeoWebCache:mainfrom
jodygarnett:release-project-version
Nov 17, 2026
Merged

jodygarnett merged 2 commits into
GeoWebCache:mainfrom
jodygarnett:release-project-version

Conversation

@jodygarnett

@jodygarnett jodygarnett commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

This allows the release.rb script to be simplified as it no longer has to do search and replace on GWC VERSION markers.

  • Use project.version rather than release.rb search and replace markers
  • address a doc warning (was blocking testing doc assembly)

This change allows the artifacts to be built under maven control (easier to follow and troubleshoot).

@jodygarnett
jodygarnett merged commit 3702148 into GeoWebCache:main Nov 17, 2026
16 checks passed
@jodygarnett
jodygarnett deleted the release-project-version branch November 17, 2026 14:53
@geoserver-bot

Copy link
Copy Markdown
Collaborator

The backport to 1.28.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1e3d62dd8... Use project.version for release assembly folders
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging geowebcache/pom.xml
CONFLICT (content): Merge conflict in geowebcache/pom.xml
Auto-merging geowebcache/release/doc.xml
CONFLICT (content): Merge conflict in geowebcache/release/doc.xml
Auto-merging geowebcache/release/src.xml
CONFLICT (content): Merge conflict in geowebcache/release/src.xml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.28.x 1.28.x
# Navigate to the new working tree
cd .worktrees/backport-1.28.x
# Create a new branch
git switch --create backport-1621-to-1.28.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1e3d62dd8414aba503e19371111f04c9f0023cd6 00bc1179c2ab90768320c283eb737edbfb809a22
# Push it to GitHub
git push --set-upstream origin backport-1621-to-1.28.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.28.x

Then, create a pull request where the base branch is 1.28.x and the compare/head branch is backport-1621-to-1.28.x.

@geoserver-bot

Copy link
Copy Markdown
Collaborator

The backport to 2.0.x failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1e3d62dd8... Use project.version for release assembly folders
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

stdout
Auto-merging geowebcache/pom.xml
CONFLICT (content): Merge conflict in geowebcache/pom.xml

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.0.x 2.0.x
# Navigate to the new working tree
cd .worktrees/backport-2.0.x
# Create a new branch
git switch --create backport-1621-to-2.0.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1e3d62dd8414aba503e19371111f04c9f0023cd6 00bc1179c2ab90768320c283eb737edbfb809a22
# Push it to GitHub
git push --set-upstream origin backport-1621-to-2.0.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.0.x

Then, create a pull request where the base branch is 2.0.x and the compare/head branch is backport-1621-to-2.0.x.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants